auto upstream
authorJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 13:31:21 +0000 (14:31 +0100)
committerJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 13:31:21 +0000 (14:31 +0100)

Trivial merge